Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(static_centerline_generator): prefix package and namespace with autoware_ #6817

Merged
merged 33 commits into from
May 15, 2024

Conversation

esteve
Copy link
Contributor

@esteve esteve commented Apr 15, 2024

Description

This PR adds the autoware_ prefix to the package and puts headers in the autoware namespace.

Part of:

Tests performed

Ran the tests suite.

Effects on system behavior

Not applicable.

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.

After all checkboxes are checked, anyone who has write access can merge the PR.

@github-actions github-actions bot added type:documentation Creating or refining documentation. (auto-assigned) component:planning Route planning, decision-making, and navigation. (auto-assigned) labels Apr 15, 2024
@esteve esteve added tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) and removed type:documentation Creating or refining documentation. (auto-assigned) component:planning Route planning, decision-making, and navigation. (auto-assigned) labels Apr 15, 2024
Copy link

mergify bot commented Apr 15, 2024

⚠️ The sha of the head commit of this PR conflicts with #6635. Mergify cannot evaluate rules on this PR. ⚠️

@esteve esteve force-pushed the prefix-static_centerline_generator branch from c0e9dce to 8415c9d Compare April 15, 2024 13:39
@github-actions github-actions bot added type:documentation Creating or refining documentation. (auto-assigned) component:planning Route planning, decision-making, and navigation. (auto-assigned) labels Apr 15, 2024
@esteve esteve force-pushed the prefix-static_centerline_generator branch from f7b938b to 5c43260 Compare April 15, 2024 14:07
@esteve esteve marked this pull request as ready for review April 16, 2024 14:13
@takayuki5168
Copy link
Contributor

@esteve
Thank you for the change.

I have one comment.
The package name's change and the refactoring had better be separated. Especially, the package name's change has a lot of code changes and has the potential to have a conflict soon, so the change should be merged as soon as possible.

When you create a new PR for the package name's change, I highly recommend not adding the refactoring change.

@esteve
Copy link
Contributor Author

esteve commented Apr 16, 2024

The package name's change and the refactoring had better be separated. Especially, the package name's change has a lot of code changes and has the potential to have a conflict soon, so the change should be merged as soon as possible.

I used the opportunity to fix the clang-tidy warnings that were causing the CI to fail, instead of ignoring them.

@mitsudome-r
Copy link
Member

@esteve As we have discussed in the Software WG call, I think it's better to first focus on package name fix first, and you can ignore the clang-tidy issues.

@esteve esteve marked this pull request as draft April 18, 2024 13:39
@esteve esteve force-pushed the prefix-static_centerline_generator branch from 99906b7 to 36e7c06 Compare April 18, 2024 14:20
@esteve esteve marked this pull request as ready for review April 22, 2024 12:58
@esteve
Copy link
Contributor Author

esteve commented Apr 22, 2024

@takayuki5168 I've reverted any performance or any other improvements detected by clang-tidy, the CI will now fail because of the clang-tidy check, but now the PR only contains the prefix changes.

Copy link
Contributor

@takayuki5168 takayuki5168 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much easier to review. Thank you!

@takayuki5168
Copy link
Contributor

@esteve
Can you fill in the following blanks in the PR's description?

Tests performed
Effects on system behavior

@esteve esteve force-pushed the prefix-static_centerline_generator branch from a542b88 to de05c29 Compare May 15, 2024 10:53
@esteve esteve enabled auto-merge (squash) May 15, 2024 11:14
@esteve esteve merged commit dbc96b3 into main May 15, 2024
22 of 23 checks passed
@esteve esteve deleted the prefix-static_centerline_generator branch May 15, 2024 12:25
@@ -168,7 +169,7 @@ std::vector<TrajectoryPoint> resample_trajectory_points(

StaticCenterlineGeneratorNode::StaticCenterlineGeneratorNode(
const rclcpp::NodeOptions & node_options)
: Node("static_centerline_generator", node_options)
: Node("autoware_static_centerline_generator", node_options)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be static_centerline_generator.

Comment on lines +220 to +232
"/planning/autoware_static_centerline_generator/load_map",
std::bind(
&StaticCenterlineGeneratorNode::on_load_map, this, std::placeholders::_1,
std::placeholders::_2),
rmw_qos_profile_services_default, callback_group_);
srv_plan_route_ = create_service<PlanRoute>(
"/planning/static_centerline_generator/plan_route",
"/planning/autoware_static_centerline_generator/plan_route",
std::bind(
&StaticCenterlineGeneratorNode::on_plan_route, this, std::placeholders::_1,
std::placeholders::_2),
rmw_qos_profile_services_default, callback_group_);
srv_plan_path_ = create_service<PlanPath>(
"/planning/static_centerline_generator/plan_path",
"/planning/autoware_static_centerline_generator/plan_path",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without the prefix.

@@ -130,7 +130,7 @@ Visualization Manager:
Filter size: 10
History Policy: Keep Last
Reliability Policy: Reliable
Value: /static_centerline_generator/input_centerline
Value: /autoware_static_centerline_generator/input_centerline
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -179,7 +179,7 @@ Visualization Manager:
Filter size: 10
History Policy: Keep Last
Reliability Policy: Reliable
Value: /static_centerline_generator/output_centerline
Value: /autoware_static_centerline_generator/output_centerline
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -222,7 +222,7 @@ Visualization Manager:
Filter size: 10
History Policy: Keep Last
Reliability Policy: Reliable
Value: /static_centerline_generator/debug/raw_centerline
Value: /autoware_static_centerline_generator/debug/raw_centerline
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -268,7 +268,7 @@ Visualization Manager:
Durability Policy: Transient Local
History Policy: Keep Last
Reliability Policy: Reliable
Value: /static_centerline_generator/debug/unsafe_footprints
Value: /autoware_static_centerline_generator/debug/unsafe_footprints
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -51,7 +51,7 @@ def get_map():
map_id = map_uuid

# create client
cli = create_client(LoadMap, "/planning/static_centerline_generator/load_map")
cli = create_client(LoadMap, "/planning/autoware_static_centerline_generator/load_map")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -85,7 +85,7 @@ def post_planned_route():
print("map_id is not correct.")

# create client
cli = create_client(PlanRoute, "/planning/static_centerline_generator/plan_route")
cli = create_client(PlanRoute, "/planning/autoware_static_centerline_generator/plan_route")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -123,7 +123,7 @@ def post_planned_path():
print("map_id is not correct.")

# create client
cli = create_client(PlanPath, "/planning/static_centerline_generator/plan_path")
cli = create_client(PlanPath, "/planning/autoware_static_centerline_generator/plan_path")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@@ -155,7 +155,7 @@ def __init__(self):
transient_local_qos = QoSProfile(depth=1, durability=QoSDurabilityPolicy.TRANSIENT_LOCAL)
self.sub_whole_centerline = self.create_subscription(
Trajectory,
"/static_centerline_generator/output_whole_centerline",
"/autoware_static_centerline_generator/output_whole_centerline",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be without prefix since the node name don't have the prefix too.

@esteve
Copy link
Contributor Author

esteve commented May 15, 2024

@xmfcx sorry, I just realized that I had enabled auto-merge and this PR got merged before your latest comments. I'll submit a followup PR with the fixes.

@esteve
Copy link
Contributor Author

esteve commented May 15, 2024

@xmfcx I've submitted #7028

@xmfcx
Copy link
Contributor

xmfcx commented May 15, 2024

Thank you, It's my mistake I didn't realized those small things in my previous review too.

vividf pushed a commit to vividf/autoware.universe that referenced this pull request May 16, 2024
… autoware_ (autowarefoundation#6817)

* build(static_centerline_generator): prefix package and namespace with autoware_

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* build: fix CMake target

Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): more renames

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): fix namespace

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix build issues

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix build issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_optimizer): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* build: fix build errors

Signed-off-by: Esteve Fernandez <[email protected]>

* fix: remove else statements after return

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* revert changes for static_centerline_generator

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): add autoware_ prefix

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix filenames

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix namespaces

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix: added prefix to missing strings

Signed-off-by: Esteve Fernandez <[email protected]>

* refactor(autoware_static_centerline_generator): move header files to src

Signed-off-by: Esteve Fernandez <[email protected]>

* refactor(autoware_static_centerline_generator): fix include paths

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* refactor(autoware_static_centerline_generator): rename base folder

Signed-off-by: Esteve Fernandez <[email protected]>

* Update planning/autoware_static_centerline_generator/launch/static_centerline_generator.launch.xml

Co-authored-by: M. Fatih Cırıt <[email protected]>
Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): fix include in CMake

Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): fix missing includes

Signed-off-by: Esteve Fernandez <[email protected]>

---------

Signed-off-by: Esteve Fernandez <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: M. Fatih Cırıt <[email protected]>
Signed-off-by: vividf <[email protected]>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Jun 3, 2024
… autoware_ (autowarefoundation#6817)

* build(static_centerline_generator): prefix package and namespace with autoware_

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* build: fix CMake target

Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): more renames

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): fix namespace

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix build issues

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix build issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_optimizer): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* build: fix build errors

Signed-off-by: Esteve Fernandez <[email protected]>

* fix: remove else statements after return

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix clang-tidy issues

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* revert changes for static_centerline_generator

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): add autoware_ prefix

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix filenames

Signed-off-by: Esteve Fernandez <[email protected]>

* fix(autoware_static_centerline_generator): fix namespaces

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* fix: added prefix to missing strings

Signed-off-by: Esteve Fernandez <[email protected]>

* refactor(autoware_static_centerline_generator): move header files to src

Signed-off-by: Esteve Fernandez <[email protected]>

* refactor(autoware_static_centerline_generator): fix include paths

Signed-off-by: Esteve Fernandez <[email protected]>

* style(pre-commit): autofix

Signed-off-by: Esteve Fernandez <[email protected]>

* refactor(autoware_static_centerline_generator): rename base folder

Signed-off-by: Esteve Fernandez <[email protected]>

* Update planning/autoware_static_centerline_generator/launch/static_centerline_generator.launch.xml

Co-authored-by: M. Fatih Cırıt <[email protected]>
Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): fix include in CMake

Signed-off-by: Esteve Fernandez <[email protected]>

* build(autoware_static_centerline_generator): fix missing includes

Signed-off-by: Esteve Fernandez <[email protected]>

---------

Signed-off-by: Esteve Fernandez <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: M. Fatih Cırıt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:planning Route planning, decision-making, and navigation. (auto-assigned) tag:deploy-docs Mark for deploy-docs action generation. (used-by-ci) tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) type:ci Continuous Integration (CI) processes and testing. (auto-assigned) type:documentation Creating or refining documentation. (auto-assigned)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants